projects
/
emacs.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3575dd8
)
; * admin/automerge: Tweak previous NEWS fix
author
Glenn Morris
<rgm@gnu.org>
Fri, 26 Oct 2018 05:08:12 +0000
(22:08 -0700)
committer
Glenn Morris
<rgm@gnu.org>
Fri, 26 Oct 2018 05:08:12 +0000
(22:08 -0700)
admin/automerge
patch
|
blob
|
history
diff --git
a/admin/automerge
b/admin/automerge
index b320369d17432cea20f702671cab7d165d573b75..8bf981744b7822401fbf4ba2674a31c57dd2173b 100755
(executable)
--- a/
admin/automerge
+++ b/
admin/automerge
@@
-176,8
+176,8
@@
merge
## FIXME it would be better to trap this in gitmerge.
## NEWS should never be modified, only eg NEWS.26.
-git diff --stat --cached origin/master | grep -q "NEWS " && \
- die "NEWS has been modified"
+git diff --stat --cached origin/master | grep -q "
etc/
NEWS " && \
+ die "
etc/
NEWS has been modified"
[ "$build" ] || exit 0